Merge "Use current preference overriding for live preview"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 11 Feb 2014 14:44:26 +0000 (14:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 11 Feb 2014 14:44:26 +0000 (14:44 +0000)

Trivial merge